From af8d8113eb68401d995aa93da2289ad8e5f717c4 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 18 Feb 2021 18:28:48 +0000 Subject: [PATCH] docs: Remove the last few remaining '+' from GTK --- gtk/gtkadjustment.c | 2 +- gtk/gtkapplication.c | 16 ++++++++-------- gtk/gtkapplicationwindow.c | 14 +++++++++----- gtk/gtkcssnode.c | 2 +- gtk/gtkfilechooserentry.c | 2 +- gtk/gtkframe.c | 6 +++--- gtk/gtkprinter.h | 3 ++- gtk/gtkshortcutsshortcut.h | 17 +++++++++-------- gtk/gtkstatusbar.c | 12 +++++++----- gtk/gtktextview.c | 4 ++-- 10 files changed, 43 insertions(+), 35 deletions(-) diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index 1e6af5a599..67713a7db0 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.c @@ -37,7 +37,7 @@ * * The #GtkAdjustment object represents a value which has an associated lower * and upper bound, together with step and page increments, and a page size. - * It is used within several GTK+ widgets, including #GtkSpinButton, #GtkViewport, + * It is used within several GTK widgets, including #GtkSpinButton, #GtkViewport, * and #GtkRange (which is a base class for #GtkScrollbar and #GtkScale). * * The #GtkAdjustment object does not update the value itself. Instead diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c index e3e4401ff5..6ab86c4cfb 100644 --- a/gtk/gtkapplication.c +++ b/gtk/gtkapplication.c @@ -53,7 +53,7 @@ * @short_description: Application class * * #GtkApplication is a class that handles many important aspects - * of a GTK+ application in a convenient fashion, without enforcing + * of a GTK application in a convenient fashion, without enforcing * a one-size-fits-all application model. * * Currently, GtkApplication handles GTK initialization, application @@ -594,7 +594,7 @@ gtk_application_class_init (GtkApplicationClass *class) * GtkApplication:register-session: * * Set this property to %TRUE to register with the session manager. - * This will make GTK+ track the session state (such as the + * This will make GTK track the session state (such as the * #GtkApplication:screensaver-active property). */ gtk_application_props[PROP_REGISTER_SESSION] = @@ -607,8 +607,8 @@ gtk_application_class_init (GtkApplicationClass *class) /** * GtkApplication:screensaver-active: * - * This property is %TRUE if GTK+ believes that the screensaver is - * currently active. GTK+ only tracks session state (including this) + * This property is %TRUE if GTK believes that the screensaver is + * currently active. GTK only tracks session state (including this) * when #GtkApplication:register-session is set to %TRUE. * * Tracking the screensaver state is supported on Linux. @@ -650,13 +650,13 @@ gtk_application_class_init (GtkApplicationClass *class) * * Concretely, gtk_init() is called in the default handler for the * #GApplication::startup signal. Therefore, #GtkApplication subclasses should - * chain up in their #GApplication::startup handler before using any GTK+ API. + * chain up in their #GApplication::startup handler before using any GTK API. * * Note that commandline arguments are not passed to gtk_init(). - * All GTK+ functionality that is available via commandline arguments + * All GTK functionality that is available via commandline arguments * can also be achieved by setting suitable environment variables * such as `G_DEBUG`, so this should not be a big - * problem. If you absolutely must support GTK+ commandline arguments, + * problem. If you absolutely must support GTK commandline arguments, * you can explicitly call gtk_init() before creating the application * instance. * @@ -698,7 +698,7 @@ gtk_application_new (const char *application_id, * will remain until the window is destroyed, but you can explicitly * remove it with gtk_application_remove_window(). * - * GTK+ will keep the @application running as long as it has + * GTK will keep the @application running as long as it has * any windows. **/ void diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index b952b644c3..3fa6b96003 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -41,8 +41,7 @@ * * #GtkApplicationWindow is a #GtkWindow subclass that offers some * extra functionality for better integration with #GtkApplication - * features. Notably, it can handle an application menubar. - * See gtk_application_set_menubar(). + * features. Notably, it can handle an application menubar. * * This class implements the #GActionGroup and #GActionMap interfaces, * to let you add window-specific actions that will be exported by the @@ -61,7 +60,7 @@ * be held when activating actions locally (if GDK threads are enabled). * * The settings #GtkSettings:gtk-shell-shows-app-menu and - * #GtkSettings:gtk-shell-shows-menubar tell GTK+ whether the + * #GtkSettings:gtk-shell-shows-menubar tell GTK whether the * desktop environment is showing the application menu and menubar * models outside the application as part of the desktop shell. * For instance, on OS X, both menus will be displayed remotely; @@ -78,9 +77,14 @@ * See #GtkPopoverMenu for information about the XML language * used by #GtkBuilder for menu models. * + * See also: [method@Gtk.Application.set_menubar]. + * * ## A GtkApplicationWindow with a menubar * - * |[ + * The code sample below shows how to set up a `GtkApplicationWindow` with a + * menu bar defined on the [class@Gtk.Application]: + * + * ```c * GtkApplication *app = gtk_application_new ("org.gtk.test", 0); * * GtkBuilder *builder = gtk_builder_new_from_string ( @@ -109,7 +113,7 @@ * // ... * * GtkWidget *window = gtk_application_window_new (app); - * ]| + * ``` */ typedef GSimpleActionGroupClass GtkApplicationWindowActionsClass; diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c index a730712b64..6ed25f9461 100644 --- a/gtk/gtkcssnode.c +++ b/gtk/gtkcssnode.c @@ -68,7 +68,7 @@ * warrant their existence change. * - Keep the state of all your nodes up-to-date. This probably requires * a ::state-flags-changed (and possibly ::direction-changed) handler, - * as well as code to update the state in other places. Note that GTK+ + * as well as code to update the state in other places. Note that GTK * does this automatically for the widget's main CSS node. * - The sibling ordering in the CSS node tree is supposed to correspond * to the visible order of content: top-to-bottom and left-to-right. diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index a9d721ba7b..59b0d34619 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -799,7 +799,7 @@ delete_text_callback (GtkFileChooserEntry *chooser_entry, * @eat_escape: If %TRUE, capture Escape key presses and emit ::hide-entry * * Creates a new #GtkFileChooserEntry object. #GtkFileChooserEntry - * is an internal implementation widget for the GTK+ file chooser + * is an internal implementation widget for the GTK file chooser * which is an entry with completion with respect to a * #GtkFileSystem object. * diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 25570c7616..ebe0111c95 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -344,9 +344,9 @@ gtk_frame_set_label (GtkFrame *frame, * to gtk_frame_new().) * * Returns: (nullable): the text in the label, or %NULL if there - * was no label widget or the label widget was not - * a #GtkLabel. This string is owned by GTK+ and - * must not be modified or freed. + * was no label widget or the label widget was not + * a #GtkLabel. This string is owned by GTK and + * must not be modified or freed. **/ const char * gtk_frame_get_label (GtkFrame *frame) diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h index 0a259d9b16..bcfb1ea75b 100644 --- a/gtk/gtkprinter.h +++ b/gtk/gtkprinter.h @@ -50,8 +50,9 @@ G_BEGIN_DECLS * pages when printing multiple pages per sheet * * An enum for specifying which features the print dialog should offer. + * * If neither %GTK_PRINT_CAPABILITY_GENERATE_PDF nor - * %GTK_PRINT_CAPABILITY_GENERATE_PS is specified, GTK+ assumes that all + * %GTK_PRINT_CAPABILITY_GENERATE_PS is specified, GTK assumes that all * formats are supported. */ typedef enum diff --git a/gtk/gtkshortcutsshortcut.h b/gtk/gtkshortcutsshortcut.h index 071a00caa4..eb47ffffaf 100644 --- a/gtk/gtkshortcutsshortcut.h +++ b/gtk/gtkshortcutsshortcut.h @@ -41,26 +41,27 @@ typedef struct _GtkShortcutsShortcutClass GtkShortcutsShortcutClass; * The shortcut is a keyboard accelerator. The #GtkShortcutsShortcut:accelerator * property will be used. * @GTK_SHORTCUT_GESTURE_PINCH: - * The shortcut is a pinch gesture. GTK+ provides an icon and subtitle. + * The shortcut is a pinch gesture. GTK provides an icon and subtitle. * @GTK_SHORTCUT_GESTURE_STRETCH: - * The shortcut is a stretch gesture. GTK+ provides an icon and subtitle. + * The shortcut is a stretch gesture. GTK provides an icon and subtitle. * @GTK_SHORTCUT_GESTURE_ROTATE_CLOCKWISE: - * The shortcut is a clockwise rotation gesture. GTK+ provides an icon and subtitle. + * The shortcut is a clockwise rotation gesture. GTK provides an icon and subtitle. * @GTK_SHORTCUT_GESTURE_ROTATE_COUNTERCLOCKWISE: - * The shortcut is a counterclockwise rotation gesture. GTK+ provides an icon and subtitle. + * The shortcut is a counterclockwise rotation gesture. GTK provides an icon and subtitle. * @GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_LEFT: - * The shortcut is a two-finger swipe gesture. GTK+ provides an icon and subtitle. + * The shortcut is a two-finger swipe gesture. GTK provides an icon and subtitle. * @GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_RIGHT: - * The shortcut is a two-finger swipe gesture. GTK+ provides an icon and subtitle. + * The shortcut is a two-finger swipe gesture. GTK provides an icon and subtitle. * @GTK_SHORTCUT_GESTURE: * The shortcut is a gesture. The #GtkShortcutsShortcut:icon property will be * used. * @GTK_SHORTCUT_GESTURE_SWIPE_LEFT: - * The shortcut is a swipe gesture. GTK+ provides an icon and subtitle. + * The shortcut is a swipe gesture. GTK provides an icon and subtitle. * @GTK_SHORTCUT_GESTURE_SWIPE_RIGHT: - * The shortcut is a swipe gesture. GTK+ provides an icon and subtitle. + * The shortcut is a swipe gesture. GTK provides an icon and subtitle. * * GtkShortcutType specifies the kind of shortcut that is being described. + * * More values may be added to this enumeration over time. */ typedef enum { diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index e997a69c5f..df104af7d7 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -42,13 +42,15 @@ * @title: GtkStatusbar * @short_description: Report messages of minor importance to the user * - * A #GtkStatusbar is usually placed along the bottom of an application's - * main #GtkWindow. It may provide a regular commentary of the application's + * A `GtkStatusbar` widget is usually placed along the bottom of an application's + * main [class@Gtk.Window]. + * + * A `GtkStatusBar` may provide a regular commentary of the application's * status (as is usually the case in a web browser, for example), or may be * used to simply output a message when the status changes, (when an upload * is complete in an FTP client, for example). * - * Status bars in GTK+ maintain a stack of messages. The message at + * Status bars in GTK maintain a stack of messages. The message at * the top of the each bar’s stack is the one that will currently be displayed. * * Any messages added to a statusbar’s stack must specify a @@ -72,9 +74,9 @@ * stack if its message id was recorded at the time it was added. This * is done using gtk_statusbar_remove(). * - * # CSS node + * ## CSS node * - * GtkStatusbar has a single CSS node with name statusbar. + * `GtkStatusbar` has a single CSS node with name `statusbar`. */ typedef struct _GtkStatusbarMsg GtkStatusbarMsg; diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index b3abee302c..45f1514cbd 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -1214,7 +1214,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) * [keybinding signal][GtkSignalAction] * which gets emitted when the user initiates a text deletion. * - * If the @type is %GTK_DELETE_CHARS, GTK+ deletes the selection + * If the @type is %GTK_DELETE_CHARS, GTK deletes the selection * if there is one, otherwise it deletes the requested number * of characters. * @@ -8243,7 +8243,7 @@ gtk_text_view_preedit_changed_handler (GtkIMContext *context, /* Keypress events are passed to input method even if cursor position is * not editable; so beep here if it's multi-key input sequence, input - * method will be reset in when the event is handled by GTK+. + * method will be reset in when the event is handled by GTK. */ gtk_im_context_get_preedit_string (context, &str, &attrs, &cursor_pos); -- 2.30.2